working on camera zoom
Merge branch 'master' of https://github.com/HeavenlyAwe/ColorJumper

Conflicts:
	UnityProject/Assets/Scenes/SceneGame.unity
	UnityProject/UnityProject.userprefs