Random css adjustments
Merge branch 'master' of github.com:sboye/djif

Conflicts:
	css/style.css