hz
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/style.css
Merge remote-tracking branch 'origin/master'
merging our efforts for header excellence