finished energy due to earth rotating
Merge pull request #14 from nealcpeters/working_on_stuff

finished energy due to earth rotating
finished aakkasnasd
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into working_on_stuff
fixed merge conflicts
Merge pull request #16 from nealcpeters/working_on_stuff

finished aakkasnasd
fixed merge conflict
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