Cambio de paradigma
Merge branch 'master' of ssh://git@github.com/JCL27/AOW.git

Conflicts:
	Age of war/src/ar/edu/itba/game/Game.java
	Age of war/src/ar/edu/itba/game/Textures.java