added the tracking code or google analytics in index.html
merged conflict modified css/style.css and renamed index.html to index.php