Fixed bug with output for today's task #66 #67
Refactored output code
Merge branch 'parser/Victor' into ui/victor