test 2
ddddd
Merge branch 'master' of https://github.com/himeshsameera/NewsManager

Conflicts:
	OnlineNewsManager/src/main/java/com/onm/DB/DB.java
	OnlineNewsManager/src/main/java/com/onm/controllers/NewsProvider.java