addes armory
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rooms/Rooms.pde