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

Conflicts:
	.DS_Store
	spanish/.DS_Store
	spanish/qb_l09/.DS_Store
	spanish/qb_l09/qb_l09_a6/.DS_Store
	spanish/qb_l09/qb_l09_a6/qb_l09_a6_Copyright.xlsx
	spanish/qb_l09/qb_l09_a6/qb_l09_a6_images/.DS_Store