commit alpha
commit beta
Merge branch 'master' of https://t-tr@github.com/t-tr/JavaParser.git

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