pre merge
Merge branch 'master' of github.com:daluce/cs181
Merge branch 'master' of github.com:daluce/cs181
revised solution to 1a