This should be the finished main file
Merge branch 'master' of https://github.com/bkold/lab2_p2