Delete index.html
revert back
revert back
revert
Update index.html
fix the stupid row fluid thing
Delete index.html
Merge branch 'develop' into staging

Conflicts:
	.c9revisions/index.html.c9save
grr