Feature 1, attempt one
Merge pull request #1 from githubstudent/feature1

Feature 1, attempt one