testing pull request
Adding the Updated schema.rb
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