Add basic user implementation
Merge branch 'master' of github.com:rnmp/coleure-db

Conflicts:
	Gemfile.lock
	db/schema.rb