Add item6 and moduel-three
Conflicts solved, module names changed and item 6 added
Merge branch 'news'