first commit
Merge branch 'master' of https://github.com/ChaosJohn/cyno_player

Conflicts:
	README.md