intermediate result
Merge remote-tracking branch 'upstream/master'
removing qtcreator user file from tracking