fix bug from merge conflicts
Merge pull request #236 from BuracayBeach/team2_v5.0b

fix bug from merge conflicts