cambios panel
Merge branch 'master' of github.com:Wargo/Bloggers_php

Conflicts:
	View/Feeds/index.ctp
	View/Feeds/view.ctp
cambios
categorizar blogs0