.gitignore
fixed license
fixed merge