Spruced up index.html with some CSS
tracking stylesheets dir
fix merge conflict