some edit work done
Merge branch 'master' of https://github.com/neastin/HouseholdDashboard
commiting changes