change
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/application.js