Merge pull request #3 from gwtnz/gh-pages

gwtnz · gwtnz · commit f720080088ad · 2015-02-05T14:14:04.000-06:00
merging in font awesome
diff --git a/index.html b/index.html
@@ -1,16 +1,32 @@
 <!DOCTYPE html>
 <html>
 <head>
+<!-- Bootstrap styles -->
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 
 <!-- Optional theme -->
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
 
-<!-- Latest compiled and minified JavaScript -->
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+<!-- Font Awesome icons -->
+<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+
+
 </head>
 <body>
+<div class="container">
+<div class="jumbotron">
 <h1>Foo!</h1>
+<button class="btn btn-primary btn-lg">Fancy <i class="fa fa-automobile">foo icon on the button!</i></button>
+</div>
+</div>
+
+<!-- BootStrap and jQuery components -->
+<!-- Latest compiled and minified JavaScript -->
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+
+<script src="//code.jquery.com/jquery-1.11.2.min.js"></script>
+<script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
+
 </body>
 </html>
