Updated BEAM parameters
Big sloppy reorganization
Add equations to new layout
Merge branch 'flask_layout' into develop

Conflicts:
	webdice/dice/equations/carbon.py
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webdice/templates/advanced.html
	webdice/templates/basic.html