Matching haircut.xxx style
Merge branch 'master' of github.com:mattvvhat/razorbla.de

Conflicts:
	app.js
	public/css/index.css
	public/css/main.css
	public/css/normalize.css
	public/js/custom/app.js
	public/js/custom/main.js
	public/js/custom/plugins.js
	public/js/vendor/jquery-1.10.2.min.js
	public/js/vendor/modernizr-2.6.2.min.js
	public/js/vendor/planworked.css
	views/index.ejs