modificacoes da reuniao
Merge branch 'master' of github.com:marcelleguine/war-game-of-thrones

Conflicts:
	projeto/War Game of Thrones/src/main/Main.java
Merge branch 'master' of github.com:marcelleguine/war-game-of-thrones