cooking gas
fixed merge issue
Merge pull request #8 from ethanspiro/murat_solo

cooking gas