Added logic expression rewriting of if expressions
Changedd test file 'for'
Added whileloop to logic phase and updated if branch