Bash test
Merge branch 'master' of https://github.com/zhanivanov/calgon

Conflicts:
	calgon.v12.suo
Player is now created via the Player constructor