rephrase
Merge branch 'master' of github.com:Ptival/lyah-fr
fixed Makefile to sort of work with new tools -- still ugly