initial commit
merging with github repo