More Changes

More Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	asympleplatformer/Assets/scripts/hazard.cs