Refactor game object n shizzle mc dizzle
Merge branch 'Riko-Branch'

Conflicts:
	src/js/core.js