More defensive programming task 2
Merge branch 'master' of https://github.com/DxTania/cs111-lab4