Added Category class. Changed Card class.
Merge branch 'master' of https://github.com/KriegersLabRats/cardGame