migration settlements table, created model, updated routes
create settlements, added link on group show page
it will calculate who owes money and to whom they owe.
there will be a record created in the settlements table.
conflicts with schema.rb, portion model and groups model
Merge branch 'master' into marcus
add status management for expense and portion
Merge branch 'master' of github.com:elitenomad/expense_tracker

solved problems and other suff
Conflicts:
	app/models/group.rb
	app/models/portion.rb
	db/schema.rb
now it actually works (hope)
now it actually works (hope)
bugs fix
Merge pull request #35 from elitenomad/federico

now it actually works (hope)
Added columns on the show page
Merge branch 'master' of https://github.com/elitenomad/expense_tracker