jolo
Merge branch 'master' of https://github.com/Snakybo/GameJam2014

Conflicts:
	Assets/Scripts/Player/Player.cs
	Assets/_Scenes/Game.unity
	ProjectSettings/TagManager.asset