added some testing stuff, updated some model stuff
Merge branch 'master' of https://github.com/crumbtray/WarGames