add module 4
solved conflicts, module 5 added
Merge pull request #4 from memsrojo/news

Add changes