put in 3 different files
three keywords ranking
Merge branch 'master' of https://github.com/CXCS130-Fall-2014/cxcatalogapi

Conflicts:
	ranking/src/.DS_Store
three cat
Merge branch 'master' into popular_tags_with_db

Conflicts:
	ranking/src/ranking/ranking.java
SQL now takes in a category to determine which table to add tags into