testing branching
Merge branch 'master' of https://github.com/plapides/BohemianArtifact into materials
prelimenary changes to materials view
Merge branch 'master' into materials
Changes to how MaterialView keeps track of materials, using the Materials class
latest material view and timeline view updates - Paul
Merged materials and master, latest and greatest, touch not working