three keywords ranking
Merge branch 'master' of https://github.com/CXCS130-Fall-2014/cxcatalogapi

Conflicts:
	ranking/src/.DS_Store