Merge branch 'hotfix/fuck'
erics new twitter handle
Merge branch 'master' into develop