#simulation_control should look fine in both Chrome and Firefox now
Merge branch 'master' of github.com:bikecomps/simulation
Moved the simulation controls to the top bar. It's hooked up but looks gross. Doesn't show up on about.html
Merge branch 'master' of github.com:bikecomps/simulation

Conflicts:
	views/app.py