Merged Game Maker

Work to date combined in one file