Merge branch 'master' of github.com:isaacfarias/Gato

Conflicts:
	src/Principal.java
Merge branch 'master' of github.com:isaacfarias/Gato
Logic of the game added, but is not complete yet!
Merge branch 'master' of github.com:isaacfarias/Gato