fancy camera zooming
Merge branch 'master' of https://github.com/HeavenlyAwe/ColorJumper

Conflicts:
	UnityProject/Assets/Scripts/PlayerInformation.cs
	UnityProject/Assets/TestingFolder/Level.cs
	UnityProject/UnityProject.userprefs
Merge branch 'master' of https://github.com/HeavenlyAwe/ColorJumper
mergin minor changes