Merge pull request #15 from brentspector/master

State Machine Skeleton redone + Fixed Resource Err