init repo
merging with master