modified .gitignore
Merge remote branch 'choose_remote_name/master'