Allow text input to make testing more sensible - Thanks nxf for idea
Use new text test inputs
Merge branch 'develop' of https://github.com/dwagon/pydominion into develop

Conflicts:
	src/cards/Card_Butcher.py
	src/cards/Card_Count.py