wizard css
Merge branch 'master' of github.com:mokujin90/madam

Conflicts:
	termin-error.log