Merge branch 'master' of github.com:neilnjae/ou-summer-of-code-2017