Merge two repository

Directly merge them, you may want use filter-branch if subdirectory needed.