added infor to parser
fixed error in the parser and printed AST
Merge branches 'master' and 'devAST'