小改
Merge branch 'master' of https://github.com/dnmgx/Vtest

Conflicts:
	Ima9ic/Base.lproj/Main_iPhone.storyboard