Human readable numbers on amount
Fixed the conflict
Merge pull request #47 from elitenomad/Pranava_Users

Pranava users