fix shit
Merge branch 'master' of https://github.com/alexandre025/solitaire

Conflicts:
	js/solitaire.js