putting .cache to global .gitignore
Merge remote-tracking branch 'origin/master'