Merge pull request #1 from shauncarpenter/resource-importer

Assimp 3D model importer
Changed README
fixed gitignore
fixed gitignore
Merge branch 'resource-importer'

Conflicts:
	.gitignore
testing again