Adding new cards to QRC and fleshing out Card
Merge remote-tracking branch 'origin/master'

Conflicts:
	QtDecks/QtDecks/Card.qml
Merge branch 'master' of https://github.com/Katieneff/QtDecks