Common.ctf
Merge branch 'master' of https://github.com/cmarchini/P2P-Program

Conflicts:
	P2P-Project/MyLogFile.log
Merge branch 'master' of https://github.com/cmarchini/P2P-Program

Conflicts:
	P2P-Project/MyLogFile.log