style
add
Merge branch 'master' of https://github.com/perfectworks/clipper

Conflicts:
	public/css/style.css