getting started with submodule
some small updates
fixed merge
merge?