Merge pull request #19 from wc351/development

Merging to the Master branch
Merge pull request #8 from wc351/master

First Master pull...10/28
Merge pull request #9 from wc351/development

Catching up on code
Merge pull request #10 from wc351/development

Development 4.0
Merge pull request #12 from wc351/development

Updating code-- fixed search and views
Merge pull request #13 from wc351/development

Updating Code
Merge pull request #14 from wc351/development

Development
Merge pull request #15 from wc351/development

Development
Added GeoLocation to Campus Maps

I went tot he campus_detail.html page and added in the code to work with the Geolocation function.  I used https://www.mapbox.com/mapbox.js/example/v1.0.0/geolocation/ as a guide with working with the GeoLocation.  When a user clicks the "Find Me" button on the top of the campus detail page, it will pop up a point of where they are at (this works really well with Mobile Devices with the GPS turned on).

I am also pushing up the loads with my file paths instead of Will's.  I also just added some Lorem Ipsom text in the About Us page.
Merge pull request #34 from clsmit8703/development2

GeoLocation, AboutUS typo, NavBarStyle and Correction
Merge pull request #3 from wc351/development

Development