fix
fix
Merge branch 'master' of https://github.com/ericthayer/MediaMod

Conflicts:
	.gitignore
	spanish/.DS_Store
	spanish/h05_a6/.DS_Store
	spanish/h05_a7/.DS_Store
	spanish/l05/.DS_Store