ed
Merge branch 'master' of https://github.com/kreuzera/PartyPlaner

Conflicts:

LocalBoy/LocalBoy.xcodeproj/project.xcworkspace/xcuserdata/melaniekuntze
.xcuserdatad/UserInterfaceState.xcuserstate

LocalBoy/LocalBoy.xcodeproj/xcuserdata/melaniekuntze.xcuserdatad/xcschem
es/LocalBoy.xcscheme
edit