modified:   p2Communication/Communicating.tex
Merge branch 'master' of github.com:Bladtman242/ITU.Year2.RentIt

Conflicts:
	BNDN-Report/p2Communication/Communicating.tex

modified:   p2Communication/Communicating.tex
modified:   p2Communication/InterfaceDocumentation.tex
modified:   testing/backendtests.tex