adding Flex, parsing of formulas working
Merge branch 'master' of https://github.com/myreg/master-thesis-tony