merged with master
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into working_on_stuff
mew branch commit
a
Merge pull request #26 from nealcpeters/building_out_ajax

fix hole where nav buttons appear if you start in desktop and resize to ...
a
added planetary weights
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into more_descriptive_branch_name
Merge pull request #27 from nealcpeters/more_descriptive_branch_name

More descriptive branch name
a
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay

Conflicts:
	app/assets/stylesheets/home_stylesheet.css
Merge pull request #28 from nealcpeters/AlexTestBranch

Alex test branch
fixed random spelling and capitalization issues
merge conflict
Merge pull request #29 from nealcpeters/neal

Neal
a
add end slide and linkage
css media queries added for mobile (which includes tablet) and desktop