add your as 最新版本。
Merge branch 'master' of git@github.com:EverythingThatYouDesire/app.git

Conflicts:
	浠诲悰鎵�眰鏈�柊鐗�apk