test
A
adfs
adsfdsf
asdf
asdf
fsg
Merge branch 'master' of https://github.com/britzke/testrepository.git

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.m2e.core.prefs
	testrepostory/src/main/java/testrepostory/Test.java