Trying to get opentok working
"merged sandya and mv's changes"

Merge branch 'master' of https://github.com/mvthen/HackCooper-Mafia

Conflicts:
	templates/chat.html