bugs gefixt
Merge branch 'master' of https://github.com/PimV/Project-GER