Implemented UnitTest and CombatantTest junit test classes

Currently there is a Class Cast Exception in UnitTest at line 42, which
adds a second waypoint to the PriorityQueue of waypoints.
Merge remote-tracking branch 'Justin/master'
Added Garrison