status after interwiev
Merge branch 'master' of github.com:Kordon70/GameOfLive

Conflicts:
	.gitignore