Updated gitignore
Merge master's gitignore
Fixed ignore file(s)
Merged 'develop', fixed conflict