Merge Conflicts

fixed merge conflicts and made corrections based on prelim feedback from
chris.

also eliminated getCenterX and getCenterY methods from entity and tests
as they are not used.
oops

missed a checkbox in previous commit