Merge pull request #17 from tgrrtt/develop

User now signs up with username (no email)