add workspace
add workspace
add .gitignore
ignore .idea/workspace.xml, workspace/featurea-studio/workspace/theSalvor/out
Merge remote-tracking branch 'origin/master'