castle array defined
Merge commit 'e0b0dbd269f235d959368748a64189ebff2d82d4'

Conflicts:
	index.html