cleaning up
.gitignore file
Merge branch 'dev'