editing the same line
Merge branch 'master' of https://github.com/pegdigital/test-repo

Conflicts:
	game.ts