done layout and routes
Merge branch 'master' of https://github.com/shubhamtagra/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/users/new.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb