Added basic index and empty css file
Fixed merge conflict