initial commit with problems
Merge branch 'master' of github.com:Armin90/mmlite

Conflicts:
	.gitignore