possible conflict in index.html
conflict in index.html fixed
Merge branch 'master' of https://github.com/FBH037/FirstRepository