Added solutions
Merge branch 'master' of /home/jae/cs3157-pub/lab1
Merge branches 'home' and 'master' into home