added support for || and && to tokenizer
added parse_condition() to parser