Edit profile page
Merge branch 'master' into Pranava_Users
cosmetic fixes
Merge pull request #62 from elitenomad/Pranava_Users

Pranava users
Merge branch 'master' into federico

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