this is a test
test
nothing
test
Merge branch 'master' of https://github.com/Tricolour/Trial

Conflicts:
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi