Updated Gemfile.lock with pg
fixed merge conflict with heroku
added pg gem to Gemfile
Merge branch 'master' of heroku.com:dancespace

Conflicts:
	config/routes.rb
	db/schema.rb
Readded pg and fixed routes when pushing to Heroku.