Fixed .gitignore
Merge branch 'master' of github.com:jbrutar/my-stuff

Conflicts:
	.gitignore