Fixed gitignore and .DS_Store files. Can't use inline-comments on gitignores evidently
Merge branch 'master' of https://github.com/hoxxep/SlickTiled