updated grammar
Merge branch 'master' of https://github.com/Robin-M/ecalogic
Extended production rules for conditionals and while loops
Merge branch 'master' of https://github.com/Robin-M/ecalogic