bad input handling
Merge branch 'master' of https://github.com/j-rewerts/CMPUT291_Project2