finished energy due to earth rotating
working ajax call to bring in and populate all partials
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
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
resolved merge conflict in stats controller