Added the ascii art
Fixed merge conflict and added the ascii art
Merge pull request #29 from willtsay/tommy

Tommy
fixed merge conflict