add other files
add some file
edit ignore file
add some files
Merge branch 'master'