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

Conflicts:
	doctor/currentpatients/linreg.php
link