GEnerating list files
Merge branch 'master' of https://github.com/damong/sync_p2p

Conflicts:
	src/main.c