friends
Merge branch 'master' of https://github.com/canyingwushang87/multipeergame

Conflicts:
	MultipeerGame/MultipeerGame/MGHappyShakeViewController.m
Merge branch 'master' of https://github.com/canyingwushang87/multipeergame