Sign-up functionality complete.
Merge conflicts resolved.
Working out weird git issue
Merge branch 'master' into create_signup
Merge branch 'create_signup'