Testing pull request
Merge remote-tracking branch 'upstream/master'
Setting up project files
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added sort
Merge origin/master into test