added non finnished cats2DB
Added extra function to item to gather keywords and tags
Merge branch 'master' of https://github.com/wensby/ai-project.git

Conflicts:
	src/Feature.java
	src/User.java
Merge branch 'master' of https://github.com/wensby/ai-project.git