Added my info
Fix conflict
Merge branch 'master' of https://github.com/orr5/chum
Merge branch 'master' of https://github.com/orr5/chum