Merge branch 'develop'

rbndelrio · Mar 9, 2015 · b3dfd89 · b3dfd89
2 parents 5598d9d + 1cc33de
commit b3dfd89
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/brewery.html b/brewery.html
@@ -10,7 +10,7 @@
 	<title>Brewery | Florida Beer Co.</title>
 	<link rel="apple-touch-icon" href="img/touch-icon.png">
 	<link rel="icon" sizes="192x192" href="img/touch-icon.png">
-	<link rel="shortcut icon" href="img/fav.ico">
+	<link rel="shortcut icon" href="img/favicon.png">
 	<link rel="stylesheet" href="css/style.css">
 	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
 	<link rel="stylesheet" href="css/fl-beer-soc.css">

diff --git a/img/favicon.png b/img/favicon.png
diff --git a/img/touch-icon.png b/img/touch-icon.png
diff --git a/index.html b/index.html
@@ -10,7 +10,7 @@
 	<title>Florida Beer Co.</title>
 	<link rel="apple-touch-icon" href="img/touch-icon.png">
 	<link rel="icon" sizes="192x192" href="img/touch-icon.png">
-	<link rel="shortcut icon" href="img/fav.ico">
+	<link rel="shortcut icon" href="img/favicon.png">
 	<link rel="stylesheet" href="css/style.css">
 	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
 	<link rel="stylesheet" href="css/fl-beer-soc.css">
@@ -33,7 +33,7 @@
 					</a>
 					<div class="fs-menu">
 						<ul class="links">
-							<li><a href="#" class="current">Beer</a></li>
+							<li><a href="#">Beer</a></li>
 							<li><a href="brewery.html">Brewery</a></li>
 							<li><a href="#">About</a></li>
 							<li><a href="#">Blog</a></li>