Yup, I added something else, isn't that awesome?
Merge branch 'myFeature' of github.com:jeffreyallen92/life into myFeature
Why am I merging again? I HAVE NO IDEA!