other changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/app.css
other changes