Homework
Merge branch 'master' of github.com:stefaneng/COMP322