Update .gitignore
add libs
Merge branch 'develop'