Mapeo de los controles issues #9 y #11

issues #9 y #11
Merge branch 'Grupo-A' of https://github.com/eloipuertas/ES2013Dimarts into Grupo-A

Conflicts:
	Badass_Upgrade/UNITY/Assembly-CSharp-firstpass.pidb
	Badass_Upgrade/UNITY/Assembly-CSharp.pidb
	Badass_Upgrade/UNITY/Assembly-UnityScript-firstpass.pidb
	Badass_Upgrade/UNITY/ProjectSettings/InputManager.asset
	Badass_Upgrade/UNITY/UNITY.userprefs

Mapeo de los controles issues #9 y #11