.DS_Store ignore
Merge branch 'master' of github.com:mattstyles/vfj-content