Created db-init file with user table
Merge pull request #1 from kmblake/kent-test

Created db-init file with user table
Merge branch 'master' into kent-test

Conflicts:
	db-init.sql