[.gitignore] Add new folder ignored.
[.gitignore] Add new folder ignored.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore