more merge issues
Merge branch 'develop' of https://github.com/shsu/comp4911 into develop