Final master commit
Merge branch 'master' of https://github.com/alanly/comp345-dnd.git