Added some cards
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/index.js
Adding Endgame stuff
Merge remote-tracking branch 'origin/master'