Merge branch 'calc' into develop - Bob's changes
Merge branch 'develop' of https://github.com/ccstevenson/KenjisQuestFrontend into develop
fixed final bracket on app.css