add License
modified License
modified License in master
conflict fixed
add a file
add .gitignore