Background Audio
Merge branch 'master' into canzhiye

This reverts commit 4d29f4de8431426f8599d8fb3f10731a28e917c1.
hopefully...
merged shit
Merge branch 'master' into canzhiye

Conflicts:

TextPlay/TextPlay.xcodeproj/project.xcworkspace/xcuserdata/canzhiye.xcus
erdatad/UserInterfaceState.xcuserstate
	TextPlay/TextPlay/ViewController.m
Merge pull request #7 from coultonvento/canzhiye

Background Audio