re-importing some assets... issues
changed settings
Merge branch 'master' of https://github.com/Kerfluffles/NoName