Update .gitignore

My first commit.

My second commit.
Merge remote-tracking branch 'origin/master' into newfeature

Conflicts:
	.gitignore
Merge pull request #1 from jiverson/newfeature

Please update