Styles, pretty styles
Styles!
Merge branch 'master' of github.com:kiasaki/sw-quebec-2014

Conflicts:
	public/stylesheets/web.css