feedback done
change .gitignore
Merge branch 'feedback'