- Comienza la intregacion del modulo "WeaponType".
Merge branch 'moises'

Conflicts:
	src/quakeagent/WeaponType.java
Merge branch 'master' of github.com:neochuky/aia_practicas

Conflicts:
	src/quakeagent/WeaponType.java