Merge pull request #3 from codinggooner/master

Upload Peers VC Logic
add count down

add count down
Merge branch 'master' of https://github.com/canyingwushang87/multipeergame

Conflicts:
	MultipeerGame/MultipeerGame.xcodeproj/project.pbxproj
	MultipeerGame/MultipeerGame/MGHappyShakeViewController.m
update ui

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

Conflicts:
	MultipeerGame/MultipeerGame.xcodeproj/project.pbxproj
	MultipeerGame/MultipeerGame/MGViewController.m
cmt

cmt
cmt

cmt
friends
add user

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

Conflicts:
	MultipeerGame/MultipeerGame.xcodeproj/project.pbxproj
	MultipeerGame/MultipeerGame/MGViewController.m
Merge branch 'master' of https://github.com/canyingwushang87/multipeergame

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

add data receive
ui

ui
add data receive

add data receive
aaa

aaa
update action

update action
Merge pull request #4 from canyingwushang87/master

Aync from canying