fix image
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/base.css
	public/css/base.styl