Merge branch 'dev'
.gitignore file added!
Updated gitignore!
Merge branch 'master' into dev