starting the weekly houdini render script
also fetched upstream changes
added some variables that will later be modified by the user
Merge remote branch 'upstream/master'
working on the parsing of shot definition file
Merge pull request #21 from nstandif/master

Checkin now works with obj export
Merge pull request #26 from nstandif/master

Added maya_discard
updated maya shelf
Merge pull request #27 from bkingery/master

updated maya shelf
added trash icon
Merge pull request #28 from bkingery/master

added trash icon
Tested the maya suite and fixed bugs
deleted old maya_obj_export.mel script
Merge pull request #29 from bkingery/master

Tested the maya suite and fixed bugs
Merge remote-tracking branch 'upstream/master'
Parsing shot list & setting output dir
Merge branch 'master', remote branch 'origin'
update brent with popup
Merge pull request #30 from bkingery/master

update brent with a popup
Merge remote branch 'upstream/master'