Test
Merge branch 'master' of https://github.com/nbonnefoy/bbqbeanjam

Conflicts:
	README.md