Picker edits
Merge branch 'master' of github.com:The-WebOps-Club/fest-api
Merge branch 'master' of github.com:The-WebOps-Club/fest-api