Algorithm Phase:

Set-finding algorithm development in Haskell
    SetCards.hs --- data typing
    Shuffle.hs --- auxilliary module for shuffling
    Deal.hs --- auxilliary module for dealing cards
    set.hs --- main algorithm module
Deal and Shuffle fixed

Added deterministic n-choose-m subset function in Shuffle.hs
Deal.hs working
Set-finder algorithm improved

Improved set-finding algorithm to filter out unnecessary searches by computing what classes of card could be members of sets based on the global property distribution.
Initial Java translation

Renamed filed in prerparation for translation into Java
Completed work on algorithm

Rewrote algorithm and card-type code in Java, tested using Haskell version as control case, added Makefile for ease of compilation
Removed deprecated class files

Removed Deal.java, SetCards.java, and Shuffle.java, which are deprecated
Set-grouping algorithm implemented

Implemented an algorithm that determines, based on the cards involved in all possible sets, what the largest concurrent combination of disjoint sets is for the pile.
Merge branch 'algorithm-java'

Conflicts:
	Card.java
Resolution:
	Used algorithm-java version