Merge branch 'registration'
Merge branch 'master' of https://github.com/siren-myx/Tarheel-Writer