commit
Merge remote-tracking branch 'origin/master'
 add .gitignore file
add some code