updated gitignore, added logging to logs/*.json
fixed merged