schema without wellcome
integration test extended
no .swp files
Merge branch 'master' into crud-users

Conflicts:
	db/schema.rb