mostly completed city menu
added attack city functionality, fixed two bugs in attack (took a LONG time)
merged