git ignore
git ingore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.project