P1 done
Merge branch 'master' of https://github.com/Foonemo/CS536