Ready the Gui, but that can change in the future!
the gui is ready but it can change in the future!
Merge branch 'master' of github.com:isaacfarias/Gato

Conflicts:
	src/Principal.java