player
Merge branch 'master' of github.com:vigour-io/vigour-ui

Conflicts:
	app/index.js