added selfie cam, updated assets, and added camera roll preview
added selfie cam, updated assets, and added camera roll preview
Merge branch 'master' of https://github.com/blairvanderhoof/StickerCam

Conflicts:
	StickerCam.xcodeproj/project.pbxproj
	StickerCam/AppDelegate.m
	StickerCam/CanvasViewController.m