Added cache to .gitignore
Ignore .zip files
Merge branch 'master' into planning