me commit
all set
Merge branch 'master' of https://github.com/dustookk/git-git.git

Conflicts:
	GItGit/src/com/gyh/gitgit/MainActivity.java