proto cond+inter
Merge branch 'master' of github.com:miuhaki/ProjCompil