Change Gemfile
Move out of assets
Remove assets group
Merge from Heroku
Merge branch 'master' of heroku.com:glacial-cliffs-8972

Conflicts:
	Gemfile
Merge branch 'master' of github.com:tkwidmer/saferstalls_rails

Conflicts:
	Gemfile
Rebuild gemfile and remove conflicts
Add rails-12factor
Add heroku port support
Merge branch 'master' of github.com:tkwidmer/refugerestrooms