Initial team 5 bugfix
Initial team 5 merge
Merge pull request #379 from BuracayBeach/Team_5_version_3.0

Team 5 version 3.0