Merge pull request #29 from nealcpeters/neal

Neal
working on it
a
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into more_descriptive_branch_name
add end slide and linkage
css media queries added for mobile (which includes tablet) and desktop
Merge pull request #30 from nealcpeters/building_out_ajax

Building out ajax
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into more_descriptive_branch_name
fixed show.html.erb error
untangle web of ridiculous arrows and swipes, hopefully everything is entirely working and perfect in js now (we can only hope)
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into building_out_ajax
Merge pull request #32 from nealcpeters/building_out_ajax

Building out ajax
Merge pull request #31 from nealcpeters/fixed_broken_show_view

Fixed broken show view
refactored ugly body mass energy js
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into fixed_broken_show_view
Merge pull request #33 from nealcpeters/fixed_broken_show_view

Fixed broken show view
basic styling, including background and fonts and a glowy button
fix merge conflict in welcome index view
Merge pull request #34 from nealcpeters/styling

Styling
spelling changes, fixed incorrect formulas, rounding