player logic
Merge branch 'master' of https://github.com/AdFabConnect/pugilism

Conflicts:
	src/resource.js
Merge branch 'master' of https://github.com/AdFabConnect/pugilism
merge menu and players