Fixing up asciify and textify
Fix merge conflict
Merge branch 'master' of https://github.com/madisonmay/Asciify_Final
Merging continued...