add a Procfile for heroku and specify database dependencies
add the procfile
Merge remote-tracking branch 'origin/master'
show random trail blocks when experiment is on
change data type of map to have the id as the key
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala
	app/models/Urls/scala.scala