add .gitignor
Merge commit '17f6a8a3f96977c0e78228b5fdea35653...
Merge branch 'master' of ssh://git.code.sf.net/...