Final commit before submission

I acknowledge that Category.calculateLargeStraight() and
Category.calculateSmallStraight() are not functional. Will fix later.