search by cattergory
Merge branch 'master' of https://github.com/sescobb27/SocialChef

Conflicts:
	.gitignore
	index.html
	js/app.js
	js/router.js