video inside video
temporary styles
Merge branch 'layout' of github.com:jmak/webrtc-translate into layout

Conflicts:
	app/styles/app.css
	app/templates/room.hbs
Merge remote-tracking branch 'szimek/master' into layout

Conflicts:
	app/styles/app.css
	app/templates/room.hbs
fix styles
Make everything a bit smaller
Fix scrolling chat box to bottom on new message