cleaned up checkout
Fixed merge conflict
Merge pull request #1 from zackbleach/integration

Integration