removing DS_Store
Merge branch 'master' of github.com:puffball/freebeer
Merge branch 'master' of github.com:puffball/freebeer
Merge branch 'master' of github.com:puffball/freebeer