Merge branch 'master' of github.com:jamoozy/gopf into video

Conflicts:
	media.js
Merge branch 'video' of github.com:jamoozy/gopf into video

Conflicts:
	media.js