Schema changed
Merge branch 'master' of https://github.com/jatin-baweja/rails-project
Made CR changes