very little changes to registration page
merge conflicts should be resolved
Merge branch 'master' of https://github.com/rebeccawalsh/diaryapp