some work
Merge branch 'master' of https://github.com/engstad/mtg-rust

Conflicts:
	src/cards.rs