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

Conflicts:
	.DS_Store
	spanish/.DS_Store