classpath
test
Merge branch 'master' of https://github.com/daenerysvn/quimpar.git

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/daenerysvn/quimpar.git
Merge branch 'master' of https://github.com/daenerysvn/quimpar.git
Merge branch 'master' of https://github.com/daenerysvn/quimpar.git
Merge branch 'master' of https://github.com/daenerysvn/quimpar.git
logos