What were the two most important city states in ancient Greece?