cc
Delete workspace.xml
Delete vcs.xml
Delete modules.xml
Delete misc.xml
Delete encodings.xml
Delete scope_settings.xml
Delete .name
Delete GitFlowSandBoxTest2.iml
Added feature 1-3
Merge branch 'testing/1-3'