Adds more details and a more thought out structure to the actions an entity can do.
netbeans config file
Merge branch 'develop' of https://github.com/316k/veggies-ate-my-neighbors into develop

Conflicts:
	src/ca/qc/bdeb/inf203/model/Combatant.java