Pull Request
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	public/stylesheets/style.styl
Pull Request