did awesome stuff, almost completed the sign up forms
Merge branch 'master' of https://github.com/esd-soft-eng/server

th ollies stuff
"