Merge pull request #363 from BuracayBeach/team2_v5.8

Team2 v5.8
fix table_
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v5.8