Assets
Merge branch 'master' of https://github.com/rodeyseijkens/Incubus

Conflicts:
	public/assets/css/style.css
	public/assets/js/incubus/game.js