Added an ignore file
Merge commit '6fc103d'