fixing bugs
Merge branch 'master' of https://github.com/Novarg1/SWOP21