new violet in index
Merge branch 'master' of https://github.com/schatten80/my-git-repo.git

Conflicts:
	index.html
Changed to real violet