Merge remote-tracking branch 'origin/master' into 65-bug-fix-tries-lukas

.DS_Store

Better Together/Better Together.xcodeproj/project.pbxproj

Better Together/Better Together/Assets.xcassets/.DS_Store

... Together/Assets.xcassets/baseLeft.imageset/Contents.json

...r Together/Assets.xcassets/baseLeft.imageset/baseLeft.png

...ogether/Assets.xcassets/baseLeft.imageset/baseLeft@2x.png

...ogether/Assets.xcassets/baseLeft.imageset/baseLeft@3x.png

...Together/Assets.xcassets/baseRight.imageset/Contents.json

...Together/Assets.xcassets/baseRight.imageset/baseRight.png

...ether/Assets.xcassets/baseRight.imageset/baseRight@2x.png

...ether/Assets.xcassets/baseRight.imageset/baseRight@3x.png

...her/Assets.xcassets/grapButtonLeft.imageset/Contents.json

...ssets.xcassets/grapButtonLeft.imageset/grapButtonLeft.png

...ts.xcassets/grapButtonLeft.imageset/grapButtonLeft@2x.png

...ts.xcassets/grapButtonLeft.imageset/grapButtonLeft@3x.png

...r/Assets.xcassets/grapButtonLeftOn.imageset/Contents.json

...s.xcassets/grapButtonLeftOn.imageset/grapButtonLeftOn.png

...cassets/grapButtonLeftOn.imageset/grapButtonLeftOn@2x.png

...cassets/grapButtonLeftOn.imageset/grapButtonLeftOn@3x.png

...er/Assets.xcassets/grapButtonRight.imageset/Contents.json