Merge remote-tracking branch 'origin/TimBranch' into Sprite
added x-flip and animation to Unity project
First pass at fillable water body
Merge remote-tracking branch 'origin/LewisBranch' into TimBranch

Conflicts:
	Assets/PlayerMove.cs
Delete