init
Merge branch 'master' of https://github.com/thiagoandrade6/java-config

Conflicts:
	.gitignore
refactoring packages name