cleaned up code
Merge branch 'master' of github.com:haiqvo/CMPS111