Merge remote-tracking branch 'origin/master'

Conflicts:
	public/stylesheets/style.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/stylesheets/style.css