gu
Merge branch 'master' of https://github.com/brianwang9100/Rhythm-Slap

Conflicts:
	RhythmSlap.spritebuilder/RhythmSlap.xcodeproj/project.pbxproj