remove register route, use email instead of username
Merge branch 'master' of https://github.com/NorthFury/hackathon
Merge branch 'master' of https://github.com/NorthFury/hackathon