adding what I got so far
Merge remote branch 'upstream/master' into HouRoll
Adding Houdini Rollback tool. Also a few changes to checkout in Houdini.
Adding the lighting_asset misc changes.
dskfjghsrg
Merge pull request #31 from cdwasden/master

Houdini Rollback
Merge pull request #32 from nstandif/master

Rollback Still Broken, but checkout / checkin / discard working
added static alembic export
got sound working for playblasts
fixed a few bugs here and there
committed to abc as primary geo format
toolbar adjustments
toolbar fix
set default clip plane
Added Startup Python Script to Mari Pipeline
Merge pull request #37 from whauwiller/master

Added Startup Python Script to Mari Pipeline
Corrected the Icons for the toolbar
Merge pull request #39 from whauwiller/master

Corrected the Icons for the toolbar
Removed references to updateDB
Merge pull request #40 from melissaEdge/master

Removed references to updateDB