display weekly report of workers
resolve conflict in home controller
Merge pull request #8 from bikashp/cf2

Cf2