Added wall rebound
Added Guillaume's merging problem
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/Player/PlayerPunch.cs