lab2 done
Merge branch 'master' of https://github.com/yingyuho/caltech-cs179-2014sp