Fixed conflict with style3.css
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into Team_5_Version_2.0
Merge pull request #219 from BuracayBeach/Team_5_Version_2.0

Team 5 version 2.0