imac-4:42 PM 03-Dec-2013
Merge branch 'master' of https://github.com/runithome/FreeCell-cli

Conflicts:
	src/Solver.java