Merge branch 'doctor_patients'
Merge branch 'master' of github.com:nganthony/ece356