small change
Merge branch 'master' of https://github.com/Idabkf/miapp

Conflicts:
	testmi/.DS_Store