testing
Merge pull request #1 from shauncarpenter/resource-importer

Assimp 3D model importer