removed comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	CopyrightAddingSoftware/repository/test.html