user validation
conflict resolved
Merge pull request #40 from emocentmagar/prachanda

Prachanda