Still need to work out how to read EOF
Merge branch 'master' of https://github.com/willetsely/cosc301_proj02