Updating

Just placing thing rihgt delted old gameplay… :)
Merge branch 'master' of https://github.com/PernilleJH/APJ

Conflicts:
	SideScroller/Assets/Scenes/Main.unity