WHATEVER COMMIT
Merge branch 'master' of https://github.com/jianyaoang/MyInstagram

Conflicts:
	MyInstagram/Base.lproj/Main.storyboard
	MyInstagram/MainViewController.m