Merge pull request #5 from malaverdiere/merge-develop

Merge develop
added git attribute file