add ! mark
conclift test1
concrifttest2
Merge branch 'changemenu'

Conflicts:
	docs/examples/hero.html