Fixing conflicts
Merging data json files
merging
typo fix
Trying to get delete to work
Delete button correctly reading what to delete
Delete is now working
Merge branch 'tngyn-branch'