a
vim
merge
Merge branch 'shamison258-master'
merge
Merge pull request #12 from cohalz/master

zenbu