two players
Merge branch 'master' of github.com:madgeeklabs/Yust
Merge branch 'master' of github.com:madgeeklabs/Yust
Merge branch 'master' of github.com:madgeeklabs/Yust

Conflicts:
	sdk-mame/app.js
Merge branch 'master' of github.com:madgeeklabs/Yust