solved manually conflict
add in portion module a method to create portion when creating expenses
static pages added
now root is pages/index
Merge branch 'master' of github.com:elitenomad/expense_tracker

manually solved routes conflits
Conflicts:
	config/routes.rb

set new root to pages/index
fixed schema problem on my side, maybe add and remove a space
decimal datatype for amount into portion table