first commit
Gemfile added
New Relic added
Rails version updated
Rails version
Gemfile.lock added
Pg and Rails 4.0.2
Merge branch 'master' of heroku.com:hidden-stream-7216

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/inflections.rb
	config/initializers/session_store.rb
	config/locales/en.yml
	config/routes.rb
	db/seeds.rb
	public/404.html
	public/422.html
	public/500.html
	public/robots.txt
	test/test_helper.rb
Gemfile