add some views

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

Conflicts:
	CMUFriends.xcodeproj/project.pbxproj
	CMUFriends/Base.lproj/Main.storyboard