some api work
Merge fixes?
Merge branch 'master' of https://github.com/SWBNE13-BananaTube/Qrate.tv

Conflicts:
	app.js