added data and some stuff
Made predictor a class, and some other stuff
Merge branch 'master' of github.com:keith-citrenbaum/cs688
merge

Conflicts:
	cs688-project/src/main/java/edu/gmu/cs688/project/App.java
	cs688-project/src/main/java/edu/gmu/cs688/project/Category.java
merged