Initial commit
reinitialized commit
Improve the README file
re-initializing first commit
Merge branch 'master' of heroku.com:obscure-ridge-1325 into static-pages

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	config.ru
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
Resolve conflicts

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
Resolve merge conflicts:

App/assets/stylesheets/application.css
App/views/layouts/application.html.erb
Config/routes.rb
Config/application.rb
Gemfile.lock
Resolve merge conflict:

Config.ru