user home and user-table
conflict resolved
Merge pull request #17 from emocentmagar/prachanda

Prachanda