added heroku database url
Merge branch 'dev'
added rails12factor to gem file
Merge branch 'dev'
added rails12factor to gem file
Merge branch 'dev' of github.com:johntrandall/ga-wdi-string-showcase into dev

Conflicts:
	Gemfile
Merge branch 'dev'