added 12 factor
Merge branch 'master' of github.com:ChrisMLee/news-zones
Merge this conflicts and nobody gets hurt 2