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

Conflicts:
	Assets/Resources/prefabs/P4.prefab
	Assets/Scenes/Main.unity
	Assets/Scripts/Player.cs
Merge branch 'master' of https://github.com/holycattle/strawberryjam.git

Conflicts:
	Assets/Scenes/Main.unity