added error-checking to user input
Merge branch 'master' of https://github.com/MazMachine/Coen174