add deck
Merge branch 'master' of https://github.com/engstad/mtg-rust

Conflicts:
	decks/jeskai-control.txt
add deck
merge
Merge branch 'master' of https://github.com/engstad/mtg-rust
Merge branch 'master' of https://github.com/engstad/mtg-rust
Merge branch 'master' of https://github.com/engstad/mtg-rust
rustc fixes