Screen flashes red when player takes damage
Merge remote-tracking branch 'origin/master'

Conflicts:
	TimeGame/Assets/Scripts/Player/Player2DController.cs