Adding gitignore to avoid clashes in merges

Change-Id: I1e4261ed9091617633c55f961487e9dcb6a894a7