Added .gitignore
no message
Merge commit 'e3eca0db97e7f70d310359cab36ba662c5082f08'
Added text