Solution to Assignment 1 - CS193P
Merge branch 'master' of https://github.com/AshRobinson/Matchismo-Assignment-1

Conflicts:
	Matchismo.xcodeproj/project.pbxproj
	Matchismo/CardGameViewController.m
	Matchismo/en.lproj/MainStoryboard.storyboard