removed assets so they will compile on heroku
updated gemfile to work with heroku
forgot to install gems
added gems needed for heroku
compiled assets for heroku
installed pg gem for heroku
Merge branch 'master' of heroku.com:tranquil-coast-3895

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/bootstrap_and_overrides.css.less