added flip and count down
Merge branch 'master' of github.com:Fanghao/MrSelfie

Conflicts:
	MrSelfie/Base.lproj/Main.storyboard
merge