Created Users Table
Merge branch 'master' of github.com:Codeniti/goa-citizen-portal-website-server-api

Conflicts:
	Gemfile.lock
	db/schema.rb