Fixed bugs. Merge fail...
Merge branch 'master' of https://github.com/PHP-Basics-Teamwork/Teamwork-Project-Files
bug