look
Merge branch 'master' of https://github.com/cringla/Cross_version

Conflicts:

Crossfit1477.xcodeproj/project.xcworkspace/xcshareddata/Crossfit1477.xcc
heckout