merge
delete
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/application-eea99778d58915e83c8e1d0150ce79eb.css