pulling
Merge branch 'master' of https://github.com/emocentmagar/stepbystep into prachanda
changes
places of interest
conflict resolved
Merge pull request #70 from emocentmagar/prachanda

Prachanda