new resources added
merge conflict resolved
Merge branch 'master' of https://github.com/ms90/wdi-data-fusion