loading our json onto a map and centering
Adding map styles and custom UFO icon
Parser
Added some more stuff
Merge branch 'master' of git://github.com/brendanbenson/ufo_sighting
Merge branch 'master' of github.com:tkellogg/ufo_sighting
progress
delete the bad stuff
fixed it
Merge branch 'master' of git://github.com/brendanbenson/ufo_sighting

Conflicts:
	.gitignore
gems
moved files
Merge branch 'master' of git://github.com/brendanbenson/ufo_sighting
use jquery to load json
Merge branch 'master' into gh-pages

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/sightings_controller.rb
	public/index.html