resolving conflicts
Merge branch 'tryGitBranch' of https://github.com/BharathBrahma/GitRailsTry into tryGitBranch

Conflicts:
	app/controllers/application_controller.rb