Add room and join room working in db
Merge branch 'dev' of https://github.com/kevtice15/TesTube into dev

Conflicts:
	app.js
	static/js/clientSockets.js
Playlists are in the db and associate with a room
So that we may unite
Merge branch 'dev' of https://github.com/kevtice15/TesTube into dev

Conflicts:
	static/js/search.js
Merge branch 'dev' of https://github.com/kevtice15/TesTube into dev

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