add Portion resource and add connection into models
Merge branch 'master' into federico

solved merging conflict on my db/schema

Conflicts:
	db/schema.rb
Merge pull request #4 from elitenomad/federico

add Portion resource and add connection into models