syncing master with ts1
updating gitignore