text/scanner
resolve conflict
text/scanner package samples
constants and formats
markdown syntax
Merge remote-tracking branch 'upstream/master'
Merge pull request #33 from cdxahz/master

text/scanner finished