resolving conflict
Image update
adding multiple
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/Deck.js