updates
Merge branch 'master' of https://github.com/mart1nez10/bars