bissl GUI gebstelt
Merge branch 'master' of https://github.com/Mome/biofeedback