Test for merge
Merge branch 'master' of
https://github.com/carlosJoseloMtz/nopalcodegroup-java.git

Conflicts:
	nopalblog/src/main/java/mx/nopalcode/nopalblog/controller/HomeController.java