test jenkins CI
fix merge conflict
testing CI
Merge pull request #69 from rackerjoe/sprint

Merged automatically by jenkins after successful gate test