added a fuckton of crap
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
merge stuff
Conflicts:
	Snapchat/Snapchat/.DS_Store
	Snapchat/Snapchat/Images.xcassets/.DS_Store
	Snapchat/Snapchat/SCMessageTableViewController.m
	Snapchat/Snapchat/SCReturnCameraViewController.m
	Snapchat/Snapchat/SCSelectFriendsViewController.m