project init
add folder www
add project
Merge branch 'master' of 192.168.116.128:/home/git/project
add testgit
something
gitignore
staticmethod
change
Merge branch 'master' of https://github.com/Web-Kevin/tor_pro

Conflicts:
	.gitignore