UP
Merge branch 'master' of https://github.com/rafaelbrunoti/javap1

Conflicts:
	src/controllers/GameController.java