fuck yeah. progress
Merge branch 'master' of https://github.com/ashih/CS143-Lab1
merge necessary