changed files to ignore
merged data and replaced activity IDs with word names