Added to .gitignore, deleted .DS_Store files
Merge branch 'master' of https://github.com/tkunisky/tvj