merge
Merge branch 'master' of github.com:johnmccutchan/asset_pack
Moving loaders and importers into separate folders.