hope this works
Merge branch 'master' of https://github.com/henryfletch/remote-care-application

Conflicts:
	report/combined report 1.aux
	report/combined report 1.log
	report/combined report 1.out
	report/combined report 1.pdf
	report/combined report 1.synctex.gz
	report/combined report 1.tex
	report/combined report 1.toc