add module 2
Merge branch 'master' into news

Conflicts:
	index2.html