database + users
Merge branch 'master' of https://github.com/mbach231/Socean