123

456
1

2
Merge branch 'master' of https://github.com/pawnielsen/XB-test

Conflicts:
	.metadata/.log
	.metadata/.mylyn/.taskListIndex/segments_1
	.metadata/.mylyn/repositories.xml.zip
	.metadata/.mylyn/tasks.xml.zip

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.co
re.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.la
unching.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui
.prefs
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml