Controller com
Merge remote-tracking branch 'origin/develvalcsa'
Merge branch 'master' of https://github.com/pbartha/TheTwoTowers

Conflicts:
	src/controllers/Controller.java
Merge remote-tracking branch 'origin/master' into develmate