Jamie commiting nothing
Merge branch 'master' of https://github.com/the-river/ResearchDatabase
Added add_user functionality should be working well now