Merge pull request #147 from BuracayBeach/Team_5_Version_2.0

Team 5 version 2.0