Only 6 more attacks for Architect left to go!!!
Merge remote-tracking branch 'origin/J'

Conflicts:
	The Midnight Station.gmx/The Midnight Station.project.gmx
	The Midnight Station.gmx/objects/o_architect_thunder.object.gmx