Castle and Fireworks Fully Operational
Merge remote-tracking branch 'origin/master'

Conflicts:
	castle-structure.js