cg - fixing up design problems on various pages
Merge branch 'master' of https://github.com/undashes/beerd

Conflicts:
	views/diary.jade