fixing
shapes overlap!
collisions among entities work!
the players swap
polymorphism for the entities
Refactory
Refactor done
Added turns and player controllers
Merge branch 'master' of https://github.com/gonch/JungleArena into
ad_entity

Conflicts:
	src/com/tdt4240/A6/junglearena/controller/factories/CharacterFactory.java
	test/com/tdt4240/A6/junglearena/controller/factories/FactoryTests.java
restored previous version
Merge pull request #20 from gonch/ad_entity

Ad entity