added 2-axis scaling, fucked up camera
added new camera, added grounded collider
merge
fixed merge stuff
Merge branch 'master' of https://github.com/JungleJinn/squarelife-ggj14

Conflicts:
	Unity/Assets/Scenes/stefan.unity