Commiting cfg changes
Merge branch 'master' of https://github.com/joanlopez/testClient.git

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/joanlopez/testClient.git
C&P Test!