recovery commit
Merge branch 'master' of https://github.com/trykowski1/Parsing

Conflicts:
	.pydevproject