jcarniglia feature file
Merge branch 'jamescarniglia-awesomefeature'

hello
Merge branch 'master' of https://github.com/githubteacher/example-branches
Merge branch 'master' of https://github.com/githubteacher/example-branches

really needed
Merge branch 'master' of https://github.com/githubteacher/example-branches
Merge branch 'master' of https://github.com/githubteacher/example-branches
Merge branch 'master' of https://github.com/githubteacher/example-branches

test