initial commit
Merge branch 'master' of github.com:cfloresm/SingleSpringMVC

Conflicts:
	.gitignore

	modified:   .gitignore