might work
Merge branch 'master' of https://github.com/robotastic/smartnet-player

Conflicts:
	index.js
	views/player.jade