primer commit
Merge branch 'master' of https://github.com/juandej18/springmvc

Conflicts:
	.gitignore