Mega Path
Merge branch 'graphic' of github.com:jpascale/RPG into graphic

Conflicts:
	GOG/src/ar/edu/itba/poo/gamelogic/Equipment.java