recording video
Merge branch 'master' of https://github.com/blackmailbox/blackmailbox-iphone

Conflicts:
	.DS_Store
	BlackmailBox.xcodeproj/project.pbxproj
	BlackmailBox/en.lproj/MainStoryboard.storyboard