.gitignore to ignore the workspace file and out directory
Merge remote-tracking branch 'origin/master'