Corregido la pagina de error
commiting again
Adding Article DAO
Merge branch 'master' of https://github.com/jkamcc/magazine-spring

Conflicts:
	java/com/app/web/HomeController.java