spikeball
Merge remote-tracking branch 'origin/master'

Conflicts:
	asympleplatformer/Assets/scripts/hazard.cs
	asympleplatformer/asympleplatformer-csharp.sln
	asympleplatformer/asympleplatformer.sln
	asympleplatformer/asympleplatformer.userprefs