merge conflicts are fun
Merge branch 'master' of https://github.com/aahernandez/burgerbar