added filmstrip and styling
Merge branch 'master' of https://github.com/swestwood/proto2-cs247-p3

Conflicts:
	public/javascript/chatroomIds.js
	public/javascript/main.js
	public/javascript/templateHtml.coffee
	public/javascript/templateHtml.js
	views/index.handlebars