I changed a file
Merge branch 'master' of https://github.com/jburns131/jackal
I made some changes