Merge branch 'master' of https://github.com/KAndrews101/Kamori

Conflicts:
	js/entities/HUD.js
	js/screens/play.js
Fixing broken code

fixing
Merge branch 'master' of https://github.com/KAndrews101/Kamori

Conflicts:
	js/entities/HUD.js
	js/screens/play.js