fixing bad merge
added assimp example code once again
syncing to lab workstation