added basic user validation
updating from master
fixed bug
added basic user validation
updating from master
fixed bug
successful rebase?
weird git stuff