pushed fixes that were overwriteen by mistake in index.html
fixing index.html
final edits to index.html to fix discrepency in merge