initial commit
merge local w remote repo