add screen flow
Merge branch 'master' of https://github.com/yijiem/CMU-Friends-new

Conflicts:
	CMUFriends/Base.lproj/Main.storyboard
	CMUFriends/homeTableViewController.m