commit from windows22222

commit from windows22222
Merge remote-tracking branch 'origin/master'

Conflicts: eddited
	index.html