update description
fixing .gitignore
re-add files
fix
Merge branch 'develop'