request
Merge branch 'master' of github.com:zozoh/blast_ios

Conflicts:
	Blast/Blast.xcodeproj/project.pbxproj
	Blast/Blast/BlastMainViewController.m