Parser
Added some more stuff
Merge branch 'master' of git://github.com/brendanbenson/ufo_sighting
Merge branch 'master' of github.com:tkellogg/ufo_sighting