yeah
Merge branch 'master' of github.com:oreillymedia/atlas_assets
new gemfile.lock
bumping to version 0.1.15
merged