Merge branch 'mockup' of https://github.com/min30327/Diagnosis_app
Merge branch 'master' of https://github.com/min30327/Diagnosis_app