.gitignore fixed
Merge branch 'ssa'
fixed a bug