fixed merge conflicts
Merge pull request #17 from nealcpeters/working_on_stuff

Working on stuff
geolocation
form now uses placeholders instead of values
resolved merge conflict in stats controller
fix merge conflicts
Merge pull request #18 from nealcpeters/neal

Neal
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into building_out_ajax
Merge pull request #19 from nealcpeters/building_out_ajax

Building out ajax
fix problem where stats don't save
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into building_out_ajax
Merge pull request #20 from nealcpeters/building_out_ajax

Building out ajax
added new thing