update gitignore
merge
remove ignored files