Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting

Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting