commit for pull
Merge branch 'master' of https://github.com/quentinR/iVrogne

Conflicts:
	iVrogne/img/empty-beer.png