progress
delete the bad stuff
fixed it
Merge branch 'master' of git://github.com/brendanbenson/ufo_sighting

Conflicts:
	.gitignore