changed gitignore
Merge branch 'master' of github.com:tlamadon/econr-notes

Conflicts:
	.gitignore