halberd added
Merge branch 'master' of https://github.com/MaybeSacred/cs4911-Game-of-Dragons