changed to rbenv and pg
precompile assets and finish the change over to pg
heroku deploy
heroku deoplys
Merge branch 'master' of heroku.com:infinite-shore-9910

Conflicts:
	.ruby-version
	config/database.yml