Gemfile
Merge branch 'master' of https://github.com/blueexpert11/Bounce
Added Heroku
Configured Database for Heroku
Added PG Gem for Heroku
Udated Gemfile.lock for Heroku
Removed Permalink File
removed permalink file
Fixed Routes
Merge branch 'stage2'

Conflicts:
	.c9revisions/config/routes.rb.c9save
	config/routes.rb