Added pictures to resources directory
Fixing controller/views conflicts
Merge branch 'master' of github.com:ChrisMLee/news-zones
Merge branch 'master' of github.com:ChrisMLee/news-zones
Updated scripts.js interval, added one news source
merging montrichers changes
adding javascript changes