commit newbranch1
Merge branch 'new_branch' of https://github.com/t-tr/JavaParser into
new_branch

Conflicts:
	JavaParser/com/ttr/test/java/parser/fic2.txt
commit new
Merge branch 'master' of https://t-tr@github.com/t-tr/JavaParser.git

Conflicts:
	JavaParser/com/ttr/test/java/parser/fic2.txt