Merge branch 'master' of /Users/andrewkil/Desktop/ece with conflicts.
added update_patient.jsp