Making stuff work
Conflicts
Fixing IDs in the form
Merge branch 'master' of https://github.com/tyllyn/CanteenReport