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

Conflicts:
	.DS_Store
	testmi/.DS_Store
	testmi/testmi.xcodeproj/project.pbxproj
	testmi/testmi/ViewController1.h
	testmi/testmi/ViewController1.m
	testmi/testmi/ViewController2.m
	testmi/testmi/background.jpg
	testmi/testmi/en.lproj/MainStoryboard.storyboard