added html, bootstrap, etc
removed conflicts