conflicts remove db/schema.rb
Merge pull request #90 from vaibhavcisin274/vaibhav

conflicts remove db/schema.rb