fixed bug
Merge branch 'master' of github.com:BEP-Project/Bachelor-Project-System