merge to master
Merge branch 'master' of https://github.com/mitdbg/asciiclass
finished part2
finished part 3