change git ignore
Merge branch 'test'

Conflicts:
	JavaParser/.gitignore