empty index.hml file
modified index.html
Modifiedd index again
Added all files to git
Merge github.com:xrigau/lscc-fun-with-git

Conflicts:
	README
	index.html