update
Merge branch 'develop'
Revert "init gitignore"

This reverts commit 24457905114182a1065cc9cda09e3c49a748b4f9.
add .gitignore