fixed view bugs. huehue
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v3.5
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v3.5
Merge pull request #178 from BuracayBeach/team2_v3.5

Team2 v3.5