layout
Merge branch 'master' of https://github.com/jplarar/Jeopardy

Conflicts:
	app/View/Categorias/index.ctp