modified .gitignore
flossed tossin
changed tossin
merge