new com 1
Merge branch 'origin/gh-pages'

Conflicts:
	self4.html
blabla commit