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

Conflicts:
Merge branch 'master' of https://github.com/MaybeSacred/cs4911-Game-of-Dragons
Halberd close to finished