Fixed .gitignore
Merge remote-tracking branch 'origin'

* origin:

Conflicts:
	.gitignore