testing again
Merge pull request #2 from shauncarpenter/resource-importer

Messing with pull requests