Added types and names for each item
Merge branch 'master' of https://github.com/vcarbune/crowdsrc