Merge branch 'feature2' of https://github.com/githubstudent/hellogitworld