kakimaki
Merge branch 'master' of https://github.com/tituszban/CompanionshipTest

Conflicts:

CompanionshipTest.xcodeproj/project.xcworkspace/xcshareddata/Companionsh
ipTest.xccheckout
kommit1
Merge branch 'master' of https://github.com/tituszban/CompanionshipTest