stuffs
Merge branch 'master' of https://github.com/Dakra23/Bachelor