Adding zeus.json to .gitignore
Merge remote-tracking branch 'origin/testing' into testing