Dev

Merged endgame into dev, now dev is all updated.