layout fix, damn you css
#Dummy
Merge branch 'master' of https://github.com/mchibouni/minimalistic-arch

Conflicts:
	main.html
	wp-content/plugins/wp-jscrollpane/css/customcolors.css
	wp-content/plugins/wp-jscrollpane/js/wpjsp.js