Added two lines to .gitignore to stop uploading Windows-specific DS_Store images and compiled binaries to the repository
Merging changes