Merge test
Merge branch 'master' of https://github.com/MrDoor/Fartblasters

Conflicts:
	Assets/Scripts/PlayerControl.cs