to remove
Merge branch 'master' of https://github.com/nonokun/hstcg.git

Conflicts:
	hearthstone/src/com/hstcg/State.java
friday changes