test2
Merge remote branch 'origin/master' into test2
dadal test2
Merge remote branch 'origin/test2'

Conflicts:
	index.html