schema changed
Merge branch 'master' of https://github.com/selvachezhian/ror_meetup

Conflicts:
	db/schema.rb