Merging our code together
Merge branch 'master' of github.com:redfern314/poe-lab1