real?
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews

Conflicts:
	src/main/webapp/Index.jsp