fixing merge conflicts
fixing merge
seed working, 2 dummy users
Merge branch 'master' into quick_test
Merge pull request #9 from amelialaundy/quick_test

Quick test