initial
Merge branch 'master' of https://github.com/specialorange/mb

Conflicts:
	.gitignore