had to commit to sync
Merge branch 'master' of https://github.com/emiloien/cs184.git