Added material state to state machine logic.  Material state now checked in WAIT state
Re-added make file, mistakenly deleted
Merge branch 'master' of github.com:mtconnect/ros_bridge