Added check for valid input
Merge branch 'master' of https://github.com/Eskimo-NZ/nwen304_login
Merge
Merge