justdoit first commit
Merge branch 'master' of github.com:eliantor/CorsoJDK2

Conflicts:
	.gitignore
Merge branch 'master' of github.com:eliantor/CorsoJDK2

Conflicts:
	.gitignore