swapping files
fixed errors, improved models for patient, integrated django admin and healhttrack admin function