Adding sprite kit scene stuff.
Fixing merge conflict
fixing merge issue with project.pbxproj
fixed another merge issue in project.pbxproj