_
Merge branch 'master' of https://github.com/piantado/LOTlib

Conflicts:
	LOTlib/Examples/__init__.pyc
GrammarDemo tweaks