Updated gitignore to ignore .ds_store files
Testing with Rascal
Merge fixing