Gemfile
add .vagrant to gitignore
Merge branch 'static-pages'
Merge branch 'master' of github.com:brandondoran/sample_app