changed project options
modified gitignore to ignore dmp files
merging changes