adds signup page
merges conflicts