added prettyprint for if else statements
added test cases for front end
fixed conflicts from merging with operators in scanner and parser