Berton
Berton1
Merge branch 'master' of https://github.com/ChuBoyu/AIfinal

Conflicts:
	src/com/fbergeron/solitaire/Solitaire.java
commit
Merge branch 'master' of https://github.com/ChuBoyu/AIfinal

Conflicts:
	src/com/fbergeron/solitaire/Solitaire.java
beautifulAI