Final commit
Merge branch 'master' of https://github.com/jerryjohnjacob/sample_app

Conflicts:
	.rspec
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb
	spec/spec_helper.rb

	modified:   .rspec
	modified:   Gemfile
	modified:   Gemfile.lock
	new file:   README.rdoc
	modified:   app/views/layouts/application.html.erb
	modified:   config/routes.rb
	modified:   spec/spec_helper.rb