merge old style, needs new colors
Merge branch 'dev' of github.com:richistron/richistron-frontend into dev

Conflicts:
	css/style.css
	css/style.less
	index.php