Updated schema.
Merge branch 'master' of github.com:ilikescience/workinginpublic

Conflicts:
	schema.sql
/getusers endpoint returns json.