Implemented initial tokenizer
Implemented full tokenizer
Merge branch tokenizer