Added support for one-statement if and while bodies
bug fixes (ignoring empty lines in CPVar)
Fixed missing curly brackets in one-stmt if-while constructor
Merge branch 'lab3' into one-stmt-if-while

* lab3:
Merge pull request #17 from samuel02/one-stmt-if-while

One stmt if while