Merge remote-tracking branch 'origin/Harsu' into Petri
Merge remote-tracking branch 'origin/master' into Petri
Harrietin lisäkset

assdf
Edited everything to work correctly

Added content info to gameobjects and edited the click method.
Merge branch 'master' of https://github.com/quido3/portfolio

Conflicts:
	Engine.js
	GameObject.js