Test Merge
Merge branch 'master' of https://github.com/Chardd/GameJam2014

Conflicts:
	GameJamProject/Assets/Scripts/PlayerScript.cs