removed module-two
resolved a conflict
Merge pull request #2 from sriharsha-sammeta/news

removed module-two