create .gitignore
Merge branch 'dev'
cleaning up code
Merge branch 'master' into dev