references to previous work on Yi
Merge branch 'master' of github.com:KoffKoff/LexGen

Conflicts:
	TODO.txt