Updated code

Updated code
Merge branch 'master' of https://github.com/tjessop/cs4220-project1