aaa
Update Holamalo.java

asasas
Merge branch 'master' of https://github.com/daton/demos-spring.git

Conflicts:
	holaSpringGit/src/main/java/com/jc/campitos/Holamalo.java
sdsdsd
asasa