to pull kevon model update
Merge branch 'dev' of github.com:kevtice15/TesTube into dev
Merge branch 'dev' of github.com:kevtice15/TesTube into dev

Conflicts:
	static/js/roomPlayer.js
	static/js/search.js