Added testing files for Aaron
Removing combat (For now)
Alex's Tests

Test classes for Ents and Ent_Enemy
Added Goal Test
updated ents

Encapsulated and added javadoc commenting to Ents.java
Updates to base entity

Added getters for xpos and ypos, encapsulated Entity.java, changed other
stuff that used entity.xpos/entity.ypos. Not sure if anything compiles
anymore n_n
Fixes for entity changes

Fixed a bunch of stuff I broke by encapsulating entity so that it'll
compile for tuesday
fixed
Updated to master and organized Combat foler