.gitignore added
gitignore updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
excess .gitignore removal