merge
removed traces of old player
Merge branch 'master' of https://github.com/joshrouwhorst/Tag