better number inputs and display

Conflicts:
	_config.yml
added images
bump version
Merge branch 'master' into gh-pages

Conflicts:
	data/energy.json
	data/mass.json
	library/styles/site.css