Changed categories since data categories are corrupted
Merge branch 'master' of ssh://github.com/CXCS130-Fall-2014/cxretrevorec