signup.jade fix
hotfix merge
merge diverged master