Algo
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	holaSpringGit/src/main/java/com/jc/campitos/HolaController.java