modified:   p1design/API-discussion.tex
Merge branch 'master' of github.com:Bladtman242/ITU.Year2.RentIt

Conflicts:
	BNDN-Report/p1design/API-discussion.tex

new file:   Appendices/dbtests.tex
new file:   Appendices/jsontests.tex
renamed:    jsontests.txt -> Appendices/jsontests.txt
modified:   Appendices/main.tex
new file:   conclussion.tex
modified:   p3final/improvements.tex
modified:   report.tex
modified:   testing/BlackBox.tex
new file:   testing/jsonservicetests.tex
modified:   testing/main.tex