Changes previous entrega TP2.
Merge branch 'master' of github.com:msturla/ati2013

Conflicts:
	src/main/java/sturla/atitp/frontend/MainFrame.java