change try
Merge branch 'master' of https://github.com/dancebutter/newGitTest

Conflicts:
	index.html
make a deletion
try to see what's going on