Fixing merge conflicts?
Merge branch 'workBeer' of https://github.com/Psykat/beerCraft into workBeer
Merge branch 'workBeer' of https://github.com/Psykat/beerCraft into workBeer
RECURSIVE DIRECTORY IN YO FACE