item 10
Merge branch 'master' of https://github.com/cschubiner/CS193p-Assignments

Conflicts:
	Matchismo/Matchismo/GameViewController.h
	Matchismo/Matchismo/GameViewController.m