Merge branch 'master' of https://github.com/bikecomps/simulation

Conflicts:
views/templates/unified.html
Resolved a conflict in unified.html