regenerating scaffolding
Merge branch 'master' of https://github.com/h-m-m/SoundHoward

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/episode.rb
	app/models/podcast.rb
	config/application.rb
	config/secrets.yml
	test/test_helper.rb
fixing merge typo