a
Merge branch 'master' of https://github.com/kser2ox/mytest1

Conflicts:
	Codecamp/Codecamp/player.cs