testing github
Merge branch 'master' of https://github.com/baohle/JustNews

Conflicts:
	src/index.html