fix
Merge branch 'master' of https://github.com/lucaslg/Ludum-Dare-31

Conflicts:
	Prefab/Action.prefab
	Scene/scene_1.unity