cg - history updates - wip
Merge branch 'master' of https://github.com/undashes/beerd

Conflicts:
	views/history.jade
cg - updating history view. looking pretty good
Merge branch 'master' of https://github.com/undashes/beerd
cg - remove erroneous js file