stuff
Merge branch 'master' of https://github.com/Xander89/ngj2014

Conflicts:
	ngj14/Assets/Scripts/GameStates/States/PlayState.cs