updated gitignore file
Merge branch 'development'
removed db stuff from settings