ubuntu check
conflict resolved
conflict resolved
Merge pull request #98 from emocentmagar/prachanda

Prachanda