updated .gitignore
Merge branch 'master' of https://github.com/corti/git-basics

Conflicts:
	.gitignore