changes done at uni
Merge branch 'master' of https://github.com/Cheat-Bluff/Cheat-Bluff.git