Update 2 files

Closed Csupka Filip requested to merge develop into master
  • /mergetest.yaml
  • /app.go

Merge request reports