Merge pull request #1 from MensEtManus/beta

Amazon AWS S3 for Paperclip uploads to Heroku
editted show_html
Merge branch 'master' of github.com:MensEtManus/Pinteresting

Conflicts:
	app/views/pins/show.html.erb
config environment edited for Heroku
fixed bug in config_environment
Changed Amazon S3 Bucket and heroku config
Merge pull request #2 from MensEtManus/master

fixed config bug and updated AWS S3 bucket