delete article
Merge remote-tracking branch 'upstream/master' into development

Conflicts:
	config/locales/en.yml
Delete Article
test
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	config/locales/en.yml
	db/schema.rb
	public/assets/manifest-e0e86382522455444bb97f8456d9a391.json
update en translation
merge from master
merge
update gitignore