merged changes
Merge branch 'master' of https://github.com/danicheman/miami-joe-or-brew