update git ignore - setting up vagrant stuff
ignoring .vagrant file
type-o in about us
Merge branch 'refs/heads/dev'