aggregate view
Merge branch 'master' of github.com:corespring/player-test-harness

Conflicts:
	views/player.jade
Merge branch 'master' of github.com:corespring/player-test-harness