mal commit initial
Merge branch 'master' of https://github.com/leonfloch/Smile3.0

Conflicts:
	.gitignore