getting stash
updating chores pages
fixing
merge this
Merge pull request #229 from dennisd7/merge-test-working

Merge test working