Matthew was on feature
Merge pull request #27 from githubteacher/matthewfeature

Matthew was on feature in teacher repo