Added previous stuff.
American Dream worked on, but not finished. NPC combo object now exists, has both dialouge and shop. Fixed a couple of minor things.
Didn't save project by mistake.
Merge remote-tracking branch 'origin/Zargy' Combines Abstract with Zargy Catering Halls Work

Conflicts:
	The Midnight Station.gmx/The Midnight Station.project.gmx