clearing conflicts
erge branch 'master' of github.com:ocelotn/spacecrab

Conflicts:
	testdata/story/node1.node
	testdata/story/node3.node
	testdata/story/node3C2.node
	testdata/story/node4A.node
	testdata/story/node4A1A1A.node
	testdata/story/node4A1A1A2.node
	testdata/story/node4A1A1A2A.node
	testdata/story/node4A1A1A2B.node
	testdata/story/node4A1A1A2C.node
	testdata/story/node4B.node
	utils/storymapper/story.svg
	utils/storymapper/storymapper.pm
trying to merge some more
Merge branch 'dev' of github.com:ocelotn/spacecrab

Conflicts:
	testdata/story/node1.node
	utils/storymapper/story.svg