Player movement tuning
Merge remote-tracking branch 'origin/Sprite' into TimBranch
Main menu added

Created main menu and buttons.
First pass at fillable water body
Merge remote-tracking branch 'origin/LewisBranch' into TimBranch

Conflicts:
	Assets/PlayerMove.cs
Delete
Added fillable water bodies
Merge branch 'LewisBranch' of https://github.com/reggiegg/emotion into LewisBranch
Replaced .blend file with .obj file
Prefabs and particles

Added some different sized prefabs for building levels.

Added particle system for dust.
Pre merge commit
Merge remote-tracking branch 'origin/LewisBranch' into TimBranch
ignore
Merge remote-tracking branch 'origin/NormanBranch' into TimBranch

Conflicts:
	Assets/test.unity
	emotion-csharp.sln
	emotion.sln
	emotion.userprefs
Merge remote-tracking branch 'origin/TimBranch' into Sprite