Edited html.index
Added social buttons in index.html
removed index.html for conflict resolution
Conflict resolution
Conflict resolution
Added analytics script
Added analytics script
Merge branch 'develop' into staging
Merge branch 'staging'