To merge.
Merge branch 'master' of https://github.com/Goyatuzo/JSSolitaire
To merge.
Merge branch 'master' of https://github.com/Goyatuzo/JSSolitaire

Conflicts:
	solitare/solitare.js