trying to add participants
Merge branch 'master' of github.com:lmccart/fixus

Conflicts:
	redux/static/hangout.js