Changes added by Minakshi
Merge branches 'test1' and 'master'
Merge branches 'test1' and 'master' into test1
Merge branches 'master' and 'test1'
Merge branches 'master' and 'test1' into test1
Third time commit
SecondRailProject/app/controllers/application_controller.rb
added a line 25dec