map 6 stuff
Merge branch 'LOLTESTING' of https://github.com/DComm2013Network/CutThePower into LOLTESTING

Conflicts:
	assets/Graphics/objects/png_object/object_animation.txt