update install instructions
Allow people to put @ in the beginning of their twitter handles when registering
fix merge conflict
Merge pull request #3 from teancom/master

Allow @ in twitter handles during registration