add module 2
Merge branch 'master' into news

Conflicts:
	index2.html
Merge pull request #2 from damnyip/news

News changes