Flecha, Soldado, Ingame, etc
(Prueba de diff)
Merge branch 'master' of https://github.com/Urkaz/Project-Arrow

Conflicts:
	src/Main.as