Created the scaffolding
Migration
Annotate
Added some map stuff
Locating buses
Finished the positioning, the date conversion, and the jQuery changing the CSS of the "buses"
Added time of last update and did some styling
Updated .gitignore
Getting extra bus set up
Updated map
Added bus location 20 to the index
Merge branch 'development' of https://github.com/harbingernews/harbingernews into development

Conflicts:
	app/assets/stylesheets/_all.css.scss
Updated the map
Merge branch 'refs/heads/bus_server' into development

Conflicts:
	config/application.rb
Fix after merge
Merge branch 'refs/heads/development' into Rails

Conflicts:
	app/assets/stylesheets/_all.css.scss