:elephant: More room changes, 14 is now 12, 12 is now 14; Added sponsor names to Rooms.
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	css/style.css
deploy script