fixing chores bugs
Merge branch 'develop' of https://github.com/Agreemates/agreemates into merge-test
fixes more chores bugs
Merge pull request #234 from dennisd7/merge-test

fixes highlight chore bug