Merge branch 'develop' into feature/users
User model and sign up
Can create users
can create users