Initial commit
merged ito master branch
merged from develop
updated .gitignore
Updated description