s444417 b6dac34e87 Merge remote-tracking branch 'origin/master' ... # Conflicts: # kelner/.idea/workspace.xml # kelner/main.py		2020-03-22 22:02:45 +01:00
kelner	Merge remote-tracking branch 'origin/master'	2020-03-22 22:02:45 +01:00
.gitignore	turned grid and waiter into objects, added gitignore file, modified movement and graphic layer update	2020-03-22 18:10:44 +01:00