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