Add
Merge branch 'master' of
https://github.com/jmo6jmo/projT-java-webservice

Conflicts:
	.gitignore