incorporated pebble frameworks
Merge branch 'master' of https://github.com/sashalives/streetfighter

Conflicts:
	streetfighter.xcodeproj/project.pbxproj