cg - updated diary form
cg - history view
Merge branch 'master' of https://github.com/undashes/beerd

Conflicts:
	views/diary/index.jade