updateing gemfile.lock
Merge branch 'hotfix-0.0.6'

* hotfix-0.0.6:
  updateing gemfile.lock
upping version number
merging conflicts