wooo added pictures for icons and some lightboxcrap yay
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
fixed merge conflict
Conflicts:
	Snapchat/Snapchat/SCMenuView.m