mostly completed lab 3
Merge branch 'master' of https://github.com/ungawatkt/Comp-15