comit
friend commit
change
dfadf
Merge branch 'master' of https://github.com/dustookk/git-git.git

Conflicts:
	GItGit/bin/classes/com/gyh/gitgit/MainActivity.class
	GItGit/src/com/gyh/gitgit/MainActivity.java