Initial commit
Generate project workspace
Merge remote-tracking branch 'origin/master'