Rearranged
Merge branch 'master' of https://github.com/madisonmay13/Image2ASCII
Fix merge conflict