Last bugfixes for the night. And death to 5L
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into Team_5_version_3.0
Merge pull request #387 from BuracayBeach/Team_5_version_3.0

Team 5 version 3.0