life decrement implemented
Merge branch 'master' of https://github.com/globalgamejam2014/Testing

Conflicts:
	Assembly-CSharp.csproj
	Assets/Scripts/Controllers/Player_Controller.cs