fun with custom views! added splash screen animation
Merge branch 'master' of https://github.com/sashalives/streetfighter

This reverts commit 560c5dbe930c4eb18ee215ba7b80da3edba82625.

Conflicts:
	streetfighter.xcodeproj/project.pbxproj

streetfighter.xcodeproj/project.xcworkspace/xcuserdata/sheinen.xcuserdat
ad/UserInterfaceState.xcuserstate