My Super Commit
Merge branch 'master' of https://github.com/tituszban/CompanionshipTest

Conflicts:
CompanionshipTest/Piner.h
Merge branch 'master' of https://github.com/tituszban/CompanionshipTest

Conflicts:
	CompanionshipTest/Piner.h
Surelfhsl
Merge branch 'master' of https://github.com/tituszban/CompanionshipTest

Conflicts:

CompanionshipTest.xcodeproj/project.xcworkspace/xcuserdata/iAKG.xcuserda
tad/UserInterfaceState.xcuserstate
	CompanionshipTest/Piner.h
EZT
Merge branch 'master' of https://github.com/tituszban/CompanionshipTest

Conflicts:
	CompanionshipTest/Piner.h