added debug log to gitignore
fixed truncated files from google analytics plugin
added debug log to gitignore
fix merge conflict