Initial commit
Merge branch 'master' of github.com:alain75007/javaschool

Conflicts:
	.gitignore