edited gitignore locally after updating it on github
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore