i changed food and movies to better ones and made a snarky comment.
Merge branch 'Mickey' of https://github.com/yale-stc-developer-curriculum/favorites into Mickey

Conflicts:
	tv-movies.txt
Merge branch 'Mickey' of https://github.com/yale-stc-developer-curriculum/favorites into Mickey

Conflicts:
	food.txt
	music.txt
	tv-movies.txt