adding git ignore to be pushed to remote
Merge branch 'development'