Updated application
Merge branch 'master' of https://github.com/IS306Minerva/EZHealth