Merge pull request #1 from Coursemology/master

Merge Masters