option to add categories
Merge branch 'master' of https://github.com/penrillian-cristian/blog

Conflicts:
	dev/src/html/gpp/home.html
adding categories
Merge branch 'master' of https://github.com/penrillian-cristian/blog

Conflicts:
	dev/src/html/gpp/home.html
	dev/src/js/gpp/controllers/HomeController.js