Added solutions
Merge branch 'master' of /home/jae/cs3157-pub/lab2
Merge branches 'github' and 'master' into github
Merge branch 'github' of https://github.com/mmienko/AP-Lab2 into github