new bad cards
Merge branch 'master' of github.com:gulbanana/clayman2

Conflicts:
	src/main/scala/common/opportunities.scala