Merge pull request #1 from blackheaven/master

Simplify tests infastructure
todo
Merge branch 'master' of github.com:etnbrd/flx-compiler
PEG grammar for fluxion
parser
problem #3 in roadmap
problem #4 almost done
problem 4 ok
Correct fluxConflict undefined call
Add IfStatement management