simple article
Merge branch 'vagrant'