Merge branch 'minorbuttonfix'
Merge branch 'master' of https://github.com/RollWave07/CareWell