Paper: Finish first draft of Conclusion
Merge branch 'master' of github.com:marcgreen/p2pbackup

Conflicts:
	paper/paper.tex