Edited patient filetree
Merge https://github.com/the-river/ResearchDatabase

Conflicts:
	css/table.css
fixed merge error
view patients
Fixed a php error preventing view-patient.php from displaying.