changes to discussion.html to make elements flex to screen
updating requirements
Merge branch 'master' of https://github.com/llcit/clt-langlabs-dev-py

 the commit.
Syncing ruby working copy
minor changes l and f
Merge branch 'master' of https://github.com/llcit/clt-langlabs-dev-py

Conflicts:
	templates/discussion.html
some minor changes by Richard

Basic changes