Everything has been tested up to this point and no errors were found
Merge branch 'master' of https://github.com/coddo/TeamSubb