db commit
Commit
Merge branch 'development' of https://github.com/DCUnit711/ep into development

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb