Camara Arreglada

La camara ya se mueve con el personaje y los npcs estan quietos
Merge branch 'master' of https://github.com/Marcos159/StormRage

Conflicts:
	StormRage-desktop/.classpath
	StormRage-desktop/assets/levels/levelredim.tmx
	StormRage-desktop/bin/levels/levelredim.tmx
	StormRage-desktop/bin/org/emg/stormRage/DesktopStormRage.class
	StormRage-desktop/src/org/emg/stormRage/DesktopStormRage.java