I add schema to app
Merge pull request #1 from elitenomad/Pranava_Users

Join Table between Groups and Users
testing pull request
add Portion resource and add connection into models
Merge pull request #2 from elitenomad/marcus

updated schema
Merge branch 'Pranava_Users'

Updated schema for the gorups and users tables
Conflicts:
	db/schema.rb
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
Nested Routes addition to the project