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

Pranava users
Merge branch 'master' into marcus

fixed css conflict
Conflicts:
	app/assets/stylesheets/custom.css.scss