a reminder to set the IP var for Heroku deployment
Merge branch 'active'