changes by vssox
Changes for application controller to show my name
Brax changes and removing one dummy controller
testing conflicts
resolving conflicts
Merge branch 'tryGitBranch' of https://github.com/BharathBrahma/GitRailsTry into tryGitBranch

Conflicts:
	app/controllers/application_controller.rb
adding new functionality
Merge branch 'tryGitBranch'