cg - diary fixes - added old-style flex box for ios
Merge branch 'master' of https://github.com/undashes/beerd

Conflicts:
	views/diary.jade
cg - updated history and diary with a header
cg - added a trendings view