All My work at once
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/scripts/Player.cs
	LudumDare31.userprefs
	ProjectSettings/DynamicsManager.asset
Merge branch 'master' of https://github.com/Xyzyx101/LudumDare31

Conflicts:
	UnityVS.LudumDare31.v12.suo