fixed merge conflicts.
Merge pull request #30 from sunny-mittal/gabe

fixed merge conflicts.