Merge pull request #218 from BuracayBeach/Team_5_Version_2.0

Maraming-maraming updates. Pero 99% tama na! :DDD
Fixed conflict with style3.css
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into Team_5_Version_2.0