macbook - early chages?
Merge branch 'master' of git+ssh://github.com/runithome/FreeCell-cli

Conflicts:
	src/Solver.java