Documentation stuff.
Small edit to gitignore
Strange merge
Merge branch 'master' of github.com:GroupDenseKitchen/KitchenOccupation