ignore .DS_Store in assets
Merge branch 'master' of github.com:nprapps/lookatthis