Update
Merge branch 'master' of https://github.com/namxkim/machismo

Conflicts:
	Matchismo.xcodeproj/project.pbxproj
	Matchismo/Card.h
	Matchismo/Card.m
	Matchismo/CardGameAppDelegate.h
	Matchismo/CardGameAppDelegate.m
	Matchismo/CardGameViewController.h
	Matchismo/CardGameViewController.m
	Matchismo/Deck.h
	Matchismo/Deck.m
	Matchismo/Default-568h@2x.png
	Matchismo/Default.png
	Matchismo/Default@2x.png
	Matchismo/Matchismo-Info.plist
	Matchismo/Matchismo-Prefix.pch
	Matchismo/PlayingCard.h
	Matchismo/PlayingCard.m
	Matchismo/PlayingCardDeck.h
	Matchismo/PlayingCardDeck.m
	Matchismo/en.lproj/InfoPlist.strings
	Matchismo/en.lproj/MainStoryboard.storyboard
	Matchismo/main.m