Merge branch 'master' of https://github.com/holycattle/strawberryjam.git

Conflicts:
	Assets/Scenes/Main.unity
Merge branch 'master' of https://github.com/holycattle/strawberryjam.git