Fixed some stuff
Merge branch 'master' of https://github.com/insignia96/bans-team-repository