Merge pull request #2 from fonglh/scribing-qns

Rebase onto Coursemology dev branch