adding tests
Merge branch 'master' of https://github.com/gdcolella/Solitare2114.git

Conflicts:
	src/com/example/solitare2114/model/SolitareGame.java