Fake commit
Merge pull request #26 from rackerlabs/my-testing-branch

merging fake pull-request