mo
Merge branch 'master' of https://github.com/lazypos/wizardbaby

Conflicts:
	WizardBaby.layout