added conditional expression to the grammer and refactored assignment expression
implemented conditional expression