conflict solve 13 feb
edit delete and link 14th feb
view_news added in rop
Merge pull request #12 from sandyshady/master

view news added and some bugs fixed today feb 14th