add .gitignore
Merge remote-tracking branch 'origin/xfynx' into xfynx