cacacacacaca
Merge branch 'master' of https://github.com/thenightraven89/ubi2014

Conflicts:
	Assets/Prefabs/CharacterGood.prefab
	Assets/Scenes/Main.unity
Merge remote-tracking branch 'origin/master'