more signup page
Merge branch 'master' of https://github.com/miklochon/angelhack

Conflicts:

public/assets/css/.sass-cache/c6875711a27dcfabff7b99a0b3978052217e50ab/m
ain.scssc