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

Conflicts:
	news-article.txt