About aded,Named Routes added,public.html removed
Merge branch 'master' of https://github.com/reposman33/sample_app

Conflicts:
	.idea/workspace.xml
	app/views/layouts/application.html.erb