pulling from upstream
resolving conflicts from pull - search merge
RECORDING IS WORKING
reverted to Ruby 2.0.0
mic changes