update gitignore
merge master branches