add kunstgriff
commit
Merged 'dev'.
Finish gui