create contributions
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/application.css.gz
	public/assets/application.js.gz
create contributions