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