Merge and clean
Merge branch 'master' of https://github.com/kent-ma/ece356