Added folders to ignore
Typo
Merge branch 'release/1.1'