Automatic Weapon Loading completed and tested
collisions among entities work!
extracted ClassReader into its own class
Weapon and Character Factory now automatically their weapons/characters.
Comments added.
Well formated.
the players swap
polymorphism for the entities
Refactory
Refactor done
Added turns and player controllers
Merge branch 'master' into mh_factory2

Conflicts:
	src/com/tdt4240/A6/junglearena/controller/factories/CharacterFactory.java
	src/com/tdt4240/A6/junglearena/controller/factories/FactoryTests.java
	src/com/tdt4240/A6/junglearena/controller/factories/WeaponFactory.java
Merge pull request #19 from gonch/mh_factory2

Mh factory2
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
Character and Weapon Factories are now singeltons. Tests updated. Calls
updated
Merge pull request #21 from gonch/mh_factory3

ooook, great!
restored latest working version of character factory
player controller factory added
fixes