remove
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestAndStudyDemo/bin/classes/.gitignore