Ignored generated sources
Merge from master conflicts in gitignore
Requested data for the guestList
Merge remote-tracking branch 'origin/ian'