Merge branch 'develop' of https://github.com/Panic-Tycoons/panic-tycoon into develop

Conflicts:
js/app.js
No conflicts