commit.
Merge branch 'master' of https://github.com/rishabhtayal/ChatApp

Conflicts:
	ChatApp/Base.lproj/Main.storyboard
	ChatApp/IntroViewController.m