up
Merge branch 'master' of https://github.com/mash2k3/MashUpMorePower

Conflicts:
	70s80scartoons.xml