asdf
asdfMerge branch 'master' of github.com:markusmo/epicminic

Conflicts:
	output/table.txt
	output/tree.txt