partial chat
Merge branch 'sam'
ignore media
added to data.json
merge
Merge branch 'data' into sam
Can now replace current photo and current song without error.