Resolving merge conflicts in index and stylesheet
Merge branch 'master' of https://github.com/team4719/MainWeb