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

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/Idabkf/miapp