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

Conflicts:
	WebContent/views/index.jsp
	src/controllers/GameController.java
	src/model/models/GameModel.java