fixing merge issue and sign up error messages
Merge pull request #9 from Flamdoodle/Users

fixing merge issue and sign up error messages