finished but uncommented
Merge branch 'master' of https://github.com/DhavalPPatel/tokenizer

Conflicts:
	tokenizer.c