TestGame3
MetaData Config
MetaData Sync
Merge branch 'master' into localBranchKG

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
Changes to Game.xsd to ensure it is in line with all class updates this week.
Merge branch 'master' of https://github.com/9124SAVOIAD/SimSys
Getting Profile Photo in Character Profile Window
Metadata
Config History
Ignore log
Ignore log
Merge branch 'localBranchKG' Getting Profile Photo

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
Getting Character Profile Window in Shape
Uncommiter Change with workbench.xmi
Merge branch 'localBranchKG' CharacterProfileWindo

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Config History update