finshed
Merge branch 'dev' of https://github.com/okuligowski/ProjektEKG into dev