collision
Merge branch 'master' of https://github.com/jschrempp/boomer-makers

Conflicts:
	README.md