add base files
update git settings
update base fiels and add submodule
merge