fixed camera flipping bug, camera functions correctly with player facing correct directions

changing x-scale by factor of -1 when going right, and by a factor of 1
when facing left
Merge remote-tracking branch 'origin/master'

Conflicts:
	asympleplatformer/Assets/CameraFollow.cs
	asympleplatformer/Assets/CameraFollow.cs.meta
	asympleplatformer/Assets/Player1.cs