test
Merge branch 'master' of https://github.com/mrunderhill89/CMPS179-ByGloveAndDagger
uploading updated guard and thief
Merge branch 'master' of https://github.com/mrunderhill89/CMPS179-ByGloveAndDagger