init 2: merge submodule into parent
Merge branch 'master' of github.com:saros-project/archnemesis

Conflicts:
	de.fu_berlin.inf.archnemesis
merge submodule