pretty printing
Merge branch 'master' of https://github.com/engstad/mtg-rust

Conflicts:
	src/deck.txt
	src/lands.json
	src/standard.rs