fixed index.html
removed index.html from staging
using theirs
more changes to index.html
using theirs
Added social buttons to index.html
Merge branch 'development' into staging