Update .gitignore
Merge commit '09a8de4cc8ee07a132e8100c04d02867a9f735be' into HEAD
Creating association between forms and working conditions