working on home
working on dashboard
Merge branch 'release' of https://github.com/team6kh/jogiyo into develop
Revert "working on dashboard"

This reverts commit 398bb187018519a119c2c77a9e25402b160e7de4.
Merge branch 'develop' into release