Merge remote-tracking branch 'dan/master'
some fixes needed for new checkout
Merge remote-tracking branch 'austin/master'
fetch/merge from Austin
Merge remote-tracking branch 'dan/master'
Updated combabtant function
Merge remote-tracking branch 'Austin/master'
Finished Model Classes
Models are now finished. Refactored to match round 3 uml diagram. 
Main change is that interactable now implements Attackable
Commenteded Model Constructors
Merge remote-tracking branch 'Dan/master'