css tweaks
Merge branch 'master' of github.com:chilloutman/chill-theme

Conflicts:
	assets/css/screen.css