new user error validation
added location validation
merge

Merge branch 'master' of https://github.com/elanas/Shuq
updated menu formatting and nav bar