Merge branch 'prism' of github.com:joshrule/GrammarInduction
Merge branch 'prism' of github.com:joshrule/GrammarInduction
Added generalization test.
Added online VBEM file.
Finished intro draft.
rework the discussion
Merge branch 'master' of https://github.com/edechter/GrammarInduction into prism

Conflicts:
	drafts/cfp/draft.tex