test
added some stuff
changed
jksafd
Merge branch 'txtChange'

Conflicts:
	src/test.txt