working in info string
Merge branch 'master' of https://github.com/puffball/freebeer
Merge branch 'master' of https://github.com/puffball/freebeer
Merge branch 'master' of https://github.com/puffball/freebeer
commit before merge pull