aasdfasdfasdfasdf
asdfghjklö
dfghjnk
Merge branch 'branch1'

Conflicts:
	src/testsmartgit.java