New test file
added conflict here too
Merge branch 'master' of https://github.com/jmagic/arrows.git

Conflicts:
	conflict.txt