edited movies and music
Merge branch 'coffee' of https://github.com/yale-stc-developer-curriculum/favorites into coffee

Conflicts:
	music.txt

 Merged after conflict, music