slideshow complete, waiting for storyboard to implement UI
Merge branch 'master' of https://github.com/Fanghao/MrSelfie

Conflicts:
	MrSelfie.xcodeproj/project.pbxproj