?
Merge branch 'master' of ssh://github.com/pTricKg/JavaPractice

Conflicts:
	JavaExamplesP/bin/.gitignore