Sync text/characters.md from master to gh-pages
Sync text/text.md from master to gh-pages
Sync text/characters.md from master to gh-pages
Sync text/text.md from master to gh-pages
Fixed conflicts, happens when I move to another computer