getting up to date
Merge branch 'master' into marcus
Human readable numbers on amount
started styling
Merge branch 'master' into marcus
Fixed the conflict
Merge pull request #47 from elitenomad/Pranava_Users

Pranava users
expense_copy fixed
Merge branch 'master' into marcus

fixed css conflict
Conflicts:
	app/assets/stylesheets/custom.css.scss
Merge pull request #48 from elitenomad/marcus

Marcus
Merge pull request #49 from elitenomad/federico

only current_user can confirm
Fixed the floating points
Merge pull request #50 from elitenomad/Pranava_Users

Fixed the floating points
inline form for new group
Fixed the portions_hash to balance_hash
Merge pull request #51 from elitenomad/Pranava_Users

Fixed the portions_hash to balance_hash
nav bar styling and page title
deleted line height css
fixed conflict on groups show:
Merge pull request #52 from elitenomad/marcus

nav bar styling and page title
Local changes
Full conflict fixled