stopped tracking gitingore to not conflict when used a remote
Merge commit '58973d063df724df2e783d545f461952f31380b1'

Conflicts:
	.gitignore