Merging
Merge remote-tracking branch 'upstream/master'
Merging with naveed
Merge remote-tracking branch 'upstream/master'
Merging with everyone
Merging with Naveed's card list
Merge pull request #26 from usik/master

Merged with Omid's and Naveed's code.