Changed bu Sabrina
Merge branch 'master' of https://github.com/DevelopersGuild/game-app-git-test

Conflicts:
	news-article.txt

This means that I had to look at both versions and choose the right way to
merge them.
Merge branch 'master' of https://github.com/DevelopersGuild/game-app-git-test