merging?
Merge branch 'master' of https://github.com/heftyy/bumbler

Conflicts:
	README.md