first commit, now in the process of using robotlegs v2
Merge branch 'master' of github.com:mimiguo/P2PTest

Conflicts:
	.gitignore