My new change
Merge pull request #2 from cameronmcefee/master

My new change